Skip to content

Integrate ouroboros-network #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
Jan 8, 2025
Merged

Integrate ouroboros-network #1314

merged 8 commits into from
Jan 8, 2025

Conversation

@neilmayhew
Copy link
Contributor

@neilmayhew neilmayhew commented Nov 20, 2024 •
edited by lehins
Loading

Description

Integrate ouroboros-network in preparation for cardano-node-10.2.0 release

See IntersectMBO/cardano-node#6040 for overall progress

@neilmayhew neilmayhew mentioned this pull request Nov 20, 2024
Closed
15 tasks
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 5 times, most recently from 9efce6b to c27d199 Compare November 20, 2024 23:39
@amesgen amesgen mentioned this pull request Nov 21, 2024
Open
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 3 times, most recently from 36b2b58 to e6ab67b Compare December 4, 2024 14:57
@jasagredo
Copy link
Contributor

FYI, the cardano-ledger commit in the SRP is gone. I suspect the new one is IntersectMBO/cardano-ledger@3fe0221 or IntersectMBO/cardano-ledger@12f6aa6 (the merge commit of the PR).

@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 2 times, most recently from 7cbd3f8 to ef51726 Compare December 13, 2024 22:30
lehins
lehins reviewed Dec 17, 2024
View reviewed changes
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 2 times, most recently from 9d27b2e to 038f9d6 Compare December 18, 2024 23:16
@lehins lehins force-pushed the neilmayhew/release-srp branch from 038f9d6 to a50e092 Compare December 23, 2024 18:33
@lehins lehins changed the title Integrate ouroboros-network and cardano-ledger Integrate ouroboros-network Dec 23, 2024
@jasagredo
Copy link
Contributor

jasagredo commented Dec 26, 2024 •
edited
Loading

@lehins This branch should incorporate the latest commits in blockfetch/milestone-1. In particular it is missing:

9e001f766 * origin/blockfetch/milestone-1 Make `ChainSelStarvation` carry an `Enclosed`
a36fd875d * Enrich comment about disabled `mustReplyTimeout`
513f34756 * Fix tests that relied on default timeouts
4e561806d * Rework default ChainSyncTimeouts in peer simulator
bee2c8445 * Log ChainSync mini-protocol events if need be
7b04c2822 * Make the `DynamoStarting` trace more explicit
ef092ca75 * Add a `TraceDrainingThePipe` event
3f8da3b60 * Improve and clarify CSJ documentation

I created #1351 which you can merge right away.

@jasagredo
Copy link
Contributor

jasagredo commented Dec 26, 2024 •
edited
Loading

I removed the no changelog label. Please only apply it at the very end when merging this iff there are changes in non-testing libraries (those whose name is not prefixed by unstable-) that do not require a changelog entry. For tests/benchmarks/unstable-*/executables, the CI check should already ignore changes in those.

If we apply this label too early in the process, we risk introducing changes in the meantime which don't end up in the Changelog.

@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch from 872196b to 111a0db Compare January 7, 2025 17:39
@neilmayhew neilmayhew marked this pull request as ready for review January 7, 2025 18:17
@neilmayhew
Copy link
Contributor Author

This is now based on #1179, and will be rebased when that is merged

@amesgen amesgen force-pushed the neilmayhew/release-srp branch from 111a0db to 9de140c Compare January 8, 2025 10:03
@amesgen amesgen enabled auto-merge January 8, 2025 10:05
@amesgen amesgen added this pull request to the merge queue Jan 8, 2025
Merged via the queue into main with commit 442f88c Jan 8, 2025
30 of 32 checks passed
@amesgen amesgen deleted the neilmayhew/release-srp branch January 8, 2025 11:13
@amesgen amesgen mentioned this pull request Jan 9, 2025
Merged
github-merge-queue bot pushed a commit that referenced this pull request Jan 9, 2025
@amesgen
Remove legacy NodeToClient serialization code (#1356)
1443bc2 
#1314 removed various old `NodeToClientVersion`s, so we can remove lots
of now-dead code.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lehins lehins lehins left review comments

@jasagredo jasagredo jasagredo left review comments

@amesgen amesgen amesgen approved these changes

@nfrisby nfrisby Awaiting requested review from nfrisby nfrisby is a code owner

@fraser-iohk fraser-iohk Awaiting requested review from fraser-iohk fraser-iohk is a code owner

@dnadales dnadales Awaiting requested review from dnadales dnadales is a code owner

@geo2a geo2a Awaiting requested review from geo2a geo2a is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@neilmayhew @jasagredo @lehins @amesgen @coot